Merge "Revert ActivityManager changes for tasks. DO NOT MERGE" into jb-mr2-dev