Merge "Bubbles: fix some issues with the pointer" into sc-dev am: 16529a26 am: c4ce4f03

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14359193

Change-Id: Ic0a655d292be00d5bdbca31d9e6c624141e2f9da