Refactor two live preview scenarios

Change-Id: I8e0dc62e24f9f86232af6b68dc4809e858aa2367
Merge "Refactor two live preview scenarios"