Merge "Save activity state before stopping acitivity when device sleeps" into nyc-mr1-dev am: 8da796d0b8
am: 1197c16ea7

Change-Id: Ic0eab67c6a23a22ac63da2a2a74ac168e9a0b325