Merge "Prevent writeDataToDisk calls when switching from guest user to primary user"