Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev