Merge 18.7 code freeze to trunk#11535

kidinov merged 8 commits intotrunkwoocommerce/woocommerce-android:trunkfrom

merge/18.7-code-freeze-into-trunkwoocommerce/woocommerce-android:merge/18.7-code-freeze-into-trunkCopy head branch name to clipboard