Merge "Fixing index bounds exception when TaskViews are added while dismissing." into nyc-mr1-dev
am: 48d24389cb

Change-Id: Ie87bea8fc37d1725513e13dbd5296f1f0d509ab1