Save activity state before stopping acitivity when device sleeps am: b5066fe307
am: 3adb9d9318

Change-Id: Ic18fbf92fe029a0eea3d886450a97c9877db7020