Merge "Camera: Change activity 'launchMode'"