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

Change-Id: I925e6bb70d1ee08437f18dfcb311c6c2943902ba