Merge "Reduce confusing usages of checking occluded keyguard" into main