Remove camera preview hack

Change-Id: I784d40a203c8f142b8889da04f85bbf761548e72