Merge "Fix issue #123704875: Editing the screenshot force closed the activity"