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

Change-Id: Iba019ab9b881b57733e9ee450d29cb570d858451