Merge "Add flag to allow hiding size compat restart button" into main