Merge "Provide an option to disable UxR change broadcast." into pi-dev