Merge "Fix notifyTaskDisplayChanged is called every time onDisplayChanged is triggered." into main