Update the local copy of preferences before saving to reflect other module changes

Change-Id: Idfd6d4f71eff9d1a1e6606b3fa91abf9ddc7b183