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: 4a72d6df
am: c4e13f04
Change-Id: Id7393ce01d95975daba90086c2e471af214eee42