Fixes for some bugs caused by the recent app/window/composer action work landing with the 3.32 UX branch.