stagehand PR review changes
Merge pull request #3618 from devoncarew/devoncarew_stagehand_review

stagehand PR review changes
Merge remote-tracking branch 'upstream/master' into small-fixes-3
Better separation from background for in-editor FABs