Merge "Sync with new drm common aidl interface" into main