Merge "Dismiss lock screen when TrustAgent and bypass" into qt-r1-dev