Merge "Mark testChangeFontScaleNoRelaunch as flaky"