Merge "Properly remove activity from task on start failure." into pi-dev
am: 65317bac02

Change-Id: Id0770cf31559d3ccd80332a4fa1178f92b360eeb