Merge "Preserve custom activity intent on relaunch" into pi-dev
am: 1b59867b9f

Change-Id: I7fa71c11e25e08d65b9e0a4e8349b934d6bf9cb1