Merge "Tell KeygaurdViewMediator about keyguard showing updates"