Boris Johnson to scrap self-isolation rule this month