Merge 11.7 final into trunk#8576

spencertransier merged 3 commits intotrunkwoocommerce/woocommerce-ios:trunkfrom

merge/11.7-final-into-trunkwoocommerce/woocommerce-ios:merge/11.7-final-into-trunkCopy head branch name to clipboard