Merge "Indicate that a TrustAgent kept the phone unlocked" into qt-dev