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

Change-Id: I5041b71149b3eaa58d85230dac26f7d22a547ae8