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

Change-Id: I394c312444e33f5b2fdcbe0887afb8ef58cef121