Merge "Enable flagging shortcuts to launch properly in a bubble" into rvc-dev...
Merge "Enable flagging shortcuts to launch properly in a bubble" into rvc-dev am: a0f44693 am: 6be27c51 am: 4215ad6c
Change-Id: I7dfccec90c28ad99d38ef54b5ecdee644d8cdde7