Merge "Moving verifyKeyguardInvisible() after other initializations" into main