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

Change-Id: I2fe6d88f2995ec10a65bf87825ff27dad6122760