am 6a261fd6: Merge "Cherry-pick system theme rebase to fix square UI on round...
am 6a261fd6: Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev
* commit '6a261fd6':
Cherry-pick system theme rebase to fix square UI on round watches