Merge "Animation of Edit mode in scene container" into main