Merge "Fix tooltips for views in a popup window" into oc-mr1-dev