Merge "Visual update for FaceSettings" into sc-dev