Merge "Remove unnecessary disk access when loading synthetic password states" into pi-dev