Merge "Apps can go from isolated to non-isolated storage" into qt-dev