Merge "Do not report config change to activity if nothing changed" into sc-dev