Merge "Don't jump focus out of the View when the Activity starts" into jb-ub-mail-ur9