Merge "Skip setting up ui if the handler is already invalidated" into sc-dev