Merge "Don't start unlock advertising when the user has no trusted device" into qt-dev