Merge "Make cross user suspension flag fixed read only" into main