Merge "Merge "Adjust usages of cross-window blur to new radius" into sc-dev am: 15936190e3 am: 355e1fd8e1" into sc-v2-dev-plus-aosp