Merge "Add restorecon flags for force and data data" into main