Merge "Provide an option to disable UxR change broadcast." into pi-dev am: 90ba1f1362
am: a8295dd75e

Change-Id: If961dba35b5111fc571cc95f1e714045eb9ed913