Properly add dock to view hierarchy.
Aside from constraint failure during setup, we now have functional dock rows
Merge remote-tracking branch 'origin/master'