Merge "Fix keyguard layout on hdpi devices"