Merge "Dispatch correct callbacks from AIDL HAL"