Fix for unnecessary RPC request when clicking on CheckBox label (#8259)

Change-Id: I7efb8b10a0d1b19ffdc9eb1d29db1f00b45f17aa