Code review comment for lp://qastaging/~lukas-kde/unity8/fix-restore-position

$ bzr branch lp:unity8 foo && cd foo
$ bzr merge lp:~ci-train-bot/unity8/unity8-ubuntu-zesty-2481 && bzr commit -m"prereq"
$ bzr merge lp:~lukas-kde/unity8/fix-restore-position
Warning: criss-cross merge encountered. See bzr help criss-cross.
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 8.15+17.04.20170303.1.
 M debian/changelog
 M po/unity8.pot
 M qml/Stage/MoveHandler.qml
 M qml/Stage/Stage.qml
 M tests/qmltests/Stage/tst_DesktopStage.qml
Text conflict in po/unity8.pot
1 conflicts encountered.