Merge "Add logic to handle screenshot file creation failure"