Merge "Improve trust handling on dimsissing keyguard"