Merge "Resume interrupted restorecon in a separate thread." into main