Merge "Make onTaskDisplayChanged/onTaskRemoved work." into rvc-dev