Merge "Make face unlock icon use correct theme attr"