Merge "Fix Binder calling identity for permissions" into main