Merge "Make sync settings restore more robust" into mnc-dev