Merge "Migrate usage of single property lister to multi prop listener." into qt-dev am: 8e24abad64
am: 554e191d4b

Change-Id: Ibc55770e1e02ed4fb8a44c6f765ec080395068bf