Merge "Reapply "Replace hidden keyguard states with occluded state"" into main