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

* commit '6a261fd653eab7c8071290b71e3bfb3fe3598a49':
  Cherry-pick system theme rebase to fix square UI on round watches