Merge "Camera: Do cancel_af before changing focus mode"