Merge "Fail focus search if focused view disappears during focus search" into nyc-dev am: ef5387f6e5
am: 42fea71a62

* commit '42fea71a6222500334f81cf6eeeac5745c93bba2':

Change-Id: Ic63760b6a0b3297bbdda18371da36eca0a19751b