Merge "Fix for activity manager crash due to null task" into nyc-dev