Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev