Merge "Don't focus search user-specified views which are invisible" into oc-dev am: 3b213ed438
am: 078728f100

Change-Id: I313b35f2f20ed4e0a0af5c45ba95816a2ed7d083