Merge "Remove difference between HW/SW when testing color filters." into pi-dev