Merge "Permit all daltonizer settings to be restored" into pi-dev