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

Change-Id: Ic542e2f100ec2bc2f3b2461c45eba22918123ef7