Merge "Avoid two SELinux related error messages at boot time" into main