Merge "Camera2: Re-entering preview state on v2 Device" into jb-mr1-dev