Merge "Make FLAG_BUBBLE public; update some documentation" into qt-dev am: b78bc92ed3
am: 57db0312c8

Change-Id: I39e0b5da94f8a5a6552561a1ad1d12163aeea746