Merge "SF: register layers with scheduler when added to current state" into sc-dev