Merge "Hide onMovedToDisplay callback" into oc-dev
am: bfe5aa23e8

Change-Id: I457340e86ffcfb9256960c554d8041a208d7cdad