Merge "Camera: fix waitUntilDrained log message" into jb-mr2-dev