Merge "Add null check for TaskView when posting onLocationChanged" into main