Merge "Add common APIs for settings datastore" into main