Merge "Increase the uninstall button touch target size" into sc-dev