Merge "Updating code due to TaskStackChangeListener changes" into tm-dev