Merge "Increase heap size for fast capture in stereo" into oc-mr1-dev