Merge "Add Setting to backup display resolution mode" into main