Merge change 37 into donut

* changes:
  Preserve an Activity's setIntent() state across relaunches