John Kelly prepares to remain on as White House chief of personnel through 2020