Merge "Ensure blur radius goes to 0" into tm-dev