Merge "Add restart button for size compatibility mode activity"