Merge "Show logout button on keyguard"