Merge conflict resolution: Applying JSS DP UI changes.

This will overwrite some changes made on the 1.1.2-beta branch.