Merge "Merge "Do not update currently open tooltip." into oc-dev am: 139dbe5c am: 2102c321" into oc-dr1-dev-plus-aosp