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

Merge commit '6ff80dcf7a9e97545be90a4c8e9a85e8a311de96' into eclair-plus-aosp

* commit '6ff80dcf7a9e97545be90a4c8e9a85e8a311de96':
  Fix #2377870 : NPE in Dock settings