Merge "Add Configuration param to onMovedToDisplay" into oc-dev
am: 36e2483663

Change-Id: I4deb6bcfb5facad1e0f85e66a149af88cbab04c2