Merge "keyguard: fix-fix layout for sw320dp devices" into cm-11.0