Merge "Remove tests for onMovedToDisplay callback" into oc-dev
am: 3557844ccf

Change-Id: I2bce436cd04857c229cc29650d3502fc0e9af410