Merge "Ensure screenshot input monitor is always removed"