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

Change-Id: Ia3fc1f16e71a4a12a0a84704b7ca7a9d2ec33514