Merge "Fix style warnings in RenderSessionImpl"