Merge "LockScreen layout, button style, and owner info fixes - enable OwnerInfo to appear in status1 if dedicated view not present. - force all status lines to be singleline and marquee. - fix justification in landscape layouts. - use buttonBarStyle for buttons on all LockScreens. - reduce the size of the clock to fit in landscape. - no longer show "Draw a pattern to unlock" help message in LockPatternView."