Merge "Test tooltip for a view in a popup window" into oc-mr1-dev