Merge "Always store the target state in a scene" into main