Merge "Add configuration-change API"