am 942feaa2: am 6ff80dcf: Fix #2377870 : NPE in Dock settings

Merge commit '942feaa2eff1153564b98a01f644083c1b58cf2d'

* commit '942feaa2eff1153564b98a01f644083c1b58cf2d':
  Fix #2377870 : NPE in Dock settings