Merge "Ensure Display Settings Overrides Do Not Impact TestDisplayContent" into sc-dev