Merge "Launch correct enrollment activity from ChooseLock" into qt-dev