Merge "Reorder RengineEngine and LayerSettings in VTS" into main