Tweaks.
Fixed conflict.
Tweaks.
Merge pull request #9127 from adobe/larz/split-polish

Split View Polish