Merge "EmulatedCamera2: Improve thread sequencing" into jb-mr1-dev