Merge conflict resolution: Applying LGJSSAddon.m changes from jss-dp-pref-panel branch.