Merge "Combine discrete listener methods into single state update" into qt-dev...
Merge "Combine discrete listener methods into single state update" into qt-dev am: a5866139 am: 885cdcae
am: c5f174e9
Change-Id: I1d8a2e656e3e6f89e33a616c76f236a8ddb9205e