am b9f29667: am 63c6a309: Merge "Add dock icon for top-level settings. #2367275" into eclair

Merge commit 'b9f2966707004b84760b498d8fc05b3c8f144f59'

* commit 'b9f2966707004b84760b498d8fc05b3c8f144f59':
  Add dock icon for top-level settings. #2367275