Merge "SF: Move/Refactor Layer::setPerFrameData"