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

Change-Id: I95be6231b0f5189892e3600077b6ffb19a528bd5