Merge "Fix tooltips for views in a popup window" into oc-mr1-dev
am: 6a1dad9194

Change-Id: I3ac05ae79fe908819d56f90c90f80cc1368670ba