Merge "Do not notifyNoFullUi if no view is focused" into oc-dev am: a44c50f362
am: e9479a21b5

Change-Id: Id0b50aa60e29d88e87c9e126f168e3effee0ebd3