Merge "Create ux restricted customizations for DeviceDefault buttons and switches" into rvc-qpr-dev