Merge "Fix testGetSettingsContextOnDualDisplayContent flakiness"