Merge "Cleanup ActivityRecord#frontOfTask and its usage"