Merge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev