Merge "Fix restriction to configure Calls & SMS" into main