Merge "SF: Move/Refactor Layer::setGeometry() to compositionengine::OutputLayer"