Merge "Refine size compat restart button visibility heuristics" into 24D1-dev