Merge change 837 into donut

* changes:
  Make the home screen come up in the simulator.