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

Change-Id: I9b58eaa8864140423fbc498b6a32f9ca01082a32