Merge "Remove resources for Developer Options feature that was deleted" into main