Fixing of UI_demo scene merge issues