Merge "Simplify preview logic"