Merge "Make SOFT_RESTRICTED reflect actual restriction state" into main