Merge "STS include missing apps from EphemeralTest" into qt-dev