Merge "SF: BufferLayer::onPostComposition display might be nullptr" into sc-v2-dev