Merge "Fix tapping on screenshot preview"