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

Change-Id: Ie4ed8565ad223fb751dded6414288ae619cd8aaa