Merge "Merge "Fix SF blur to be as blurry as Gaussian blur" into sc-dev am: e78acd5b6a am: 4d9d9d9e31" into sc-v2-dev-plus-aosp