Merge commit 'cbbc035b640790650d0e377a2d6291cc523a2a35' * commit 'cbbc035b640790650d0e377a2d6291cc523a2a35': Unhide new API for supporting multiple cameras.