Merge "Always include uid as part of recentApp key" into qt-dev