Merge "Allow changing UX restrictions of UxrButton" into pi-car-dev am: d5077fb53e am: 720cd16b46 am: 49c290530d

Change-Id: I25be5aaf490c279a7fab43f6f832cf579de07bbf