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