Merge "Stay in face settings unless the user explicitly backs out" into qt-dev