Merge "Camera2: Add MANUAL capture intent"