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

Change-Id: Idd82083b388c55dc9b4c1c2fe19d864c7a7207e6