am e871772c: am 56de05bc: Merge "Adjust minimum screen size for watches in CTS" into klp-modular-dev * commit 'e871772c': Adjust minimum screen size for watches in CTS