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

Change-Id: I4b026c2f273ee34860f8100b017c56fe627a2d1f