Merge "Fail focus search if focused view disappears during focus search" into nyc-dev