Merge "Remove outdated code which prevents setting activity task in some scenarios"