Merge "Refine size compat restart button visibility heuristics" into main