Merge "Add config to allow start activities on long press." into pi-dev
am: cfa439f02f

Change-Id: I9d5cc4ab30e7d5529df39d1587be07cb6781d3a3