Merge "Fix 3381660: Update PasswordUnlock screen's EditText background." into honeycomb