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

Change-Id: Ia0999b1f9c862f97dc26b8eb17b8500cd07bd0cb