Merge "Moving developer settings to xml overrides instead of code swap" into main