Merge changes I25423a2b,I24680f1a into jb-mr2-dev

* changes:
  ProCamera: Add CpuConsumer asynchronous mode support
  Camera: Drop ProCamera connections when a Camera connection happens