Merge changes from topic "am-a0c5902d1c414f6a99db4f229f9a3b6e"

* changes:
  Merge "[automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4a -s ours" am: 53afae20 -s ours am: b501a1ba -s ours am: 730b3cca -s ours am: 215e70a1 -s ours am: 1dd643c4 -s ours
  [automerger skipped] [Provider Model] Fix the overlap when changing the font/display size am: 941c4a4a -s ours am: 1df9c88a -s ours am: aee77bdc -s ours am: 993e2ec4 -s ours am: c0111cc0 -s ours am: a735eb75 -s ours