Merge "Update dimens used to filter widgets" into main