Prevent settings page from rendering same page twice

Closes #2316
- There was a check to prevent rerendering of same content pane but it wasn't working
- Fixed the check for this
Merge pull request #2317 from shashankmehta/settings-rendering-issue

Prevent settings page from rendering same page twice