Merge "Fix 3382123: Set default state of LockScreen portrait kb" into honeycomb