Merge "Require shortcut to bubble" into rvc-dev am: 1dbf98fb am: f0c52ab4 am: 3237ce33 am: 310ca103 Change-Id: I90711f99fd0d7509a67563a414ba97ef116454a2