Merge "Do not update currently open tooltip." into oc-dev