Merge "Merge "Use a PopupWindow to show tooltips" into oc-dev am: 8493543ce3 am: 629c15297f"