Merge "Refactor callbacks to avoid extra binder calls" into qt-dev