Merge "Camera2: Clean up startup/shutdown sequences." into jb-mr1-dev