Merge "Clearer diag for visible keyguard" into sc-dev