Merge "Fix bluetooth aidl crash" into main