Merge "Adjust minimum screen size for watches in CTS" into klp-modular-dev