Merge "Fixes failing CTS tests for Save dialog Screenshots showing no changes from before: http://shortn/_n52tNerWx6" into main