Merge "Refactor callbacks to avoid extra binder calls" into qt-dev
am: 1422232c3e

Change-Id: Idb757122b32096598cf676c26dc343472fdabe72