Merge "Fixes crash in face enrollment during set up in work mode" into tm-qpr-dev