Merge "Add flag to protect custom view restriction changes" into main