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

Change-Id: I19def868c16ba2100d235e5e8ecb164283ab9777