Merge changes from topic "am-dac06f62-7156-4508-8ecc-a3370b21c8f6"

* changes:
  [automerger] Set preference summary textAlignment am: 5cfd706b88
  Set preference summary textAlignment