Merge "Do not update currently open tooltip." into oc-dev am: 139dbe5c1c
am: 3fd4215760

Change-Id: I4b9674e73830462bbe9288ebfa1bbac89af860b3