Partially revert "Preview: Use GL everywhere + UX changes"

This reverts commit 327ffdf2b4ee075b0ac03e3430f44feaf37c04ee.

Change-Id: Ic8d0d8b28c92e0a8b9a112d5b3cbd8a00fe806f0