Merge "Camera: Enable liveshot during 4K recording"