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

Change-Id: I5e7b6742544a5db4266e95be0ce01830ea62cd92