Merge "Fix 3148496: Update LockScreen layouts on large device"