Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2