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