Merge "Fixing a bug where content capture sessions with child sessions could...

Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev am: 4aa0aead am: c1b765e7
am: 6b365322

Change-Id: Idcce863bc63e9fb38d5a54080dcd9b86e192941c