Merge "Camera2: Still image support"