Merge "Return non-null empty list if the controller is already invalidated" into sc-v2-dev