Merge "Add disabled checkbox preference" into pi-dev