Merge "Rename getIntent() to getRenderIntent()" into oc-dev