Merge "Show screenshot and select in task menu" into main