Merge changes from topic "am-b20de8b656cb4ec5837abba07523ee9b"

* changes:
  Merge "[automerger skipped] Enable nested scrolling for locale picker am: 589f88b9 -s ours" am: 9b8871ac -s ours am: 3bf3e5c8 -s ours am: 3f3185a2 -s ours am: 3248e64b -s ours am: efa88285 -s ours
  [automerger skipped] Enable nested scrolling for locale picker am: 589f88b9 -s ours am: e605577e -s ours am: e7d923d2 -s ours am: 59e2ad1b -s ours am: 04e153a4 -s ours am: 4e067f3b -s ours