Merge "Change to show generic lock screen before setup fingerprint or face" into qt-dev