Merge "Merge "Require shortcut to bubble" into rvc-dev am: 1dbf98fb am: b60d52c6 am: 608f1afa" into rvc-qpr-dev-plus-aosp