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

Change-Id: I34b9b957b47da302d521b64e80d9e16f094e2b34