UK PM Johnson orders airport scanner upgrade by 2022