Merge "Changed DllIport entry point for new system-settings API for callback."

No match.