Merge "Bubbles policy: require remote input for messaging" into qt-dev am: f879566d28
am: 509956d6dc

Change-Id: I68e60a642b1c91b78499d82616c35908b3e417d0