Merge "User restriction to block adding SIMs" into main