Merge "Move pointer after dismissing un-expanded bubble" into rvc-dev