Merge commit 'caaf7fe3a407c764f643585d050c16f5fb56503c' * commit 'caaf7fe3a407c764f643585d050c16f5fb56503c': Handle the camera open failure better.
Merge commit 'caaf7fe3a407c764f643585d050c16f5fb56503c' * commit 'caaf7fe3a407c764f643585d050c16f5fb56503c': Handle the camera open failure better.