Merge "Don't focus search user-specified views which are invisible" into oc-dev