Merge "Add Configuration param to onMovedToDisplay" into oc-dev