Merge changes from topic "mkephart-screenshot-constants" into main

* changes:
  Duplicate ScreenshotController under a flag
  Move code/interfaces out of ScreenshotController