Merge "Fix other reproduction of invisible keyguard race" into tm-qpr-dev