Merge "Retry auth during tap on lock screen." into qt-r1-dev