Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev