Merge "Fix no apps shown on app info screen" into qt-dev