Merge "Merge "Require shortcut to bubble" into rvc-dev am: 1dbf98fb57 am: b60d52c691 am: 608f1afaf8" into rvc-qpr-dev-plus-aosp