Merge "Fix onMovedToDisplay callback test"