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

Change-Id: I0ea5de71243c04763904ff55dc999b14862076fd