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