Merge "Do not recursively call setFocusedActivityLocked()"