Merge "Not using settings app in tests" into ub-launcher3-qt-dev
am: 643007d613

Change-Id: I0b39d644c20d31e150f800ee1757d6ae3d6596ad