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

Change-Id: I204d788ce63c1a60474f3296f30d46ab0e479e60