Merge "make setup wizard's wifi and datetime settings look good for 7"" into honeycomb-mr2