Merge "Fix #testChangeFontScaleNoRelaunch flaky" into tm-dev