diff --git a/core/res/res/layout-land/keyguard_host_view.xml b/core/res/res/layout-land/keyguard_host_view.xml
index e76951b4a47e4..980f6990b1a4c 100644
--- a/core/res/res/layout-land/keyguard_host_view.xml
+++ b/core/res/res/layout-land/keyguard_host_view.xml
@@ -45,7 +45,7 @@
 
         <View android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:layout_childType="scrim"
+              androidprv:layout_childType="scrim"
               android:background="#99000000" />
 
         <com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer
diff --git a/core/res/res/layout-sw600dp/keyguard_glow_pad_container.xml b/core/res/res/layout-sw600dp/keyguard_glow_pad_container.xml
index 207bc57282820..930b14e925ecb 100644
--- a/core/res/res/layout-sw600dp/keyguard_glow_pad_container.xml
+++ b/core/res/res/layout-sw600dp/keyguard_glow_pad_container.xml
@@ -21,4 +21,4 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center" />
-</merge>
+</merge>
\ No newline at end of file
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index f377c847a9eb6..8671ee8f8e256 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -245,9 +245,6 @@
     <!-- TEMP -->
     <dimen name="kg_security_panel_height">600dp</dimen>
 
-    <!-- Width of security view in keyguard. -->
-    <dimen name="kg_glow_pad_size">500dp</dimen>
-
     <!-- Height of security view in keyguard. -->
     <dimen name="kg_security_view_height">0dp</dimen>
 
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 1dfb6e0785e65..da26e6a1c9968 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -2479,7 +2479,8 @@ please see styles_device_defaults.xml.
     </style>
 
     <!-- Keyguard PIN pad styles -->
-    <style name="Widget.Button.NumPadKey">
+    <style name="Widget.Button.NumPadKey"
+            parent="@android:style/Widget.Button">
         <item name="android:singleLine">true</item>
         <item name="android:padding">6dip</item>
         <item name="android:gravity">left|center_vertical</item>
@@ -2489,7 +2490,8 @@ please see styles_device_defaults.xml.
         <item name="android:textStyle">normal</item>
         <item name="android:textColor">#ffffff</item>
     </style>
-    <style name="TextAppearance.NumPadKey">
+    <style name="TextAppearance.NumPadKey"
+            parent="@android:style/TextAppearance">
         <item name="android:textSize">34dp</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:textStyle">normal</item>
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
index e54e02c173112..70c4bbc959a26 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
@@ -181,14 +181,13 @@ public class KeyguardHostView extends KeyguardViewBase {
 
         mViewStateManager.showUsabilityHints();
 
-        updateSecurityViews();
         if (!(mContext instanceof Activity)) {
             setSystemUiVisibility(getSystemUiVisibility() | View.STATUS_BAR_DISABLE_BACK);
         }
 
-        if (KeyguardUpdateMonitor.getInstance(mContext).getIsFirstBoot()) {
-            showPrimarySecurityScreen(false);
-        }
+        showPrimarySecurityScreen(false);
+
+        updateSecurityViews();
     }
 
     private void updateSecurityViews() {
@@ -426,7 +425,8 @@ public class KeyguardHostView extends KeyguardViewBase {
     void showPrimarySecurityScreen(boolean turningOff) {
         SecurityMode securityMode = mSecurityModel.getSecurityMode();
         if (DEBUG) Log.v(TAG, "showPrimarySecurityScreen(turningOff=" + turningOff + ")");
-        if (!turningOff && KeyguardUpdateMonitor.getInstance(mContext).isAlternateUnlockEnabled()) {
+        if (!turningOff && KeyguardUpdateMonitor.getInstance(mContext).isAlternateUnlockEnabled()
+                && !KeyguardUpdateMonitor.getInstance(mContext).getIsFirstBoot()) {
             // If we're not turning off, then allow biometric alternate.
             // We'll reload it when the device comes back on.
             securityMode = mSecurityModel.getAlternateFor(securityMode);
diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
index af35021f34191..bc12e96e475fe 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java
@@ -95,7 +95,7 @@ import com.android.internal.widget.LockPatternUtils;
  */
 public class KeyguardViewMediator {
     private static final int KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT = 30000;
-    final static boolean DEBUG = true;
+    final static boolean DEBUG = false;
     private final static boolean DBG_WAKE = false;
 
     private final static String TAG = "KeyguardViewMediator";