Merge "Remove view map from customization option util (1/2)" into main