Merge "Modify the case in adjustFocus when the mFocusedActivity is null" am: 80587da3c1 am: 93c75d07c1
am: d975003af3

Change-Id: If4ff1ee251842598f1a5e8dedb7858daed201206