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: 29f39212
am: 24c1b4b8
Change-Id: I4491c755cb4e0850394268ad3088b8f5ee1ba6bb