Add preview screen
(cherry picked from commit 8ef6aff)