am 85aed84e: (-s ours) am c00b1067: Merge "Pushing the startActivity before the calls to remove task." into mnc-dev

* commit '85aed84e25a7f07cc229efa1749e2bd4f95d184b':