Merge "Fix wakelock test not turning screen on before test" into qt-dev