Merge "Cleanup activity and task creation in unit tests."