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

Change-Id: Ic69295685644f6190cc56e6f5acb940856b8cc8e