Fix for #9124.
Fix for #9244.
Merge pull request #9246 from adobe/larz/more-r44-ui-fixes

More R44 UI fixes