Merge "Feature flag for display resolution backup/restore" into main