Merge "Only log restorecon changes for existing dirs."