Merge "Resue TaskView information. am: 0a5e2d6b93" into nyc-mr2-dev-plus-aosp