Merge "Fix soft restricted flag computation for shared UID" into main