Merge "SF: LayerCommand moved to Display Command"