Merge "Add a sysprop to switch between blur algorithms" into main