Merge "Skip task snapshot if display has not been enabled" into sc-dev