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

Change-Id: I5436618eb3ddd752a95caa5b0c427a3e32279a49