Merge "Fix capture animation if we are far away from the camera preview." into jb-dev