Merge "Hide onMovedToDisplay callback" into oc-dev