Added dock indicator customization support.
Merge remote-tracking branch 'remotes/origin/development_3.0' into development_3.0