Merge "don't trigger a render when setting the rendermode" into jb-mr2-dev