Merge "Mark perm DB version as -1 when upgrading from P" into qt-dev