Merge "Ensure screenshot input monitor is always removed" into sc-v2-dev