Merge "Fix style warnings in RenderSessionImpl [DO NOT MERGE]" into klp-dev