Merge "Keyguard should be dismissed if there is no trusted device." into qt-qpr1-dev
am: d7353d5c33

Change-Id: I37a5f7edc56db4ac33a9ad8a1ea43354c2abd655