Merge changes I02236342,I5e693d91,I0d3c09d4 into main

* changes:
  Consolidate layer snapshot functions for screenshots
  Encapsulate excludeLayerId logic into a function
  Cleaner ScreenshotArg struct init, function parameter cleanup