Merge "Persist settings on a normal priority thread."