Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev