Merge "Camera: Allow out of order ZSL shutter vs regular shutter" into qt-dev...
Merge "Camera: Allow out of order ZSL shutter vs regular shutter" into qt-dev am: 5f312765 am: 50b41ea9
am: 2de5f51b
Change-Id: I40fc1d2bba645b5c438fea1cda3f5186a192ddee