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

Change-Id: I89fbd9b85353dc308f56185f8c0a6837e48c2341