Merge "Add onPreferenceChange_update tests" into sc-dev