Merge "Fix edit button in screenshot share activity"