Merge "Switch trust agents to extend unlock mode by default." into qt-dev