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

Change-Id: Ie885e7fd929e54f62ae920ec8840d8abb0c5075f