Added option menu + fix for remove starting the preview on surfaceChanged