simplified event flow
Merge pull request #5519 from adobe/couzteau/preview-images-r-b

simplified event flow