Merge "Camera: turn off ZSL when checking timestamps" into pi-dev
am: 921ae7f2fc

Change-Id: I1a960ed5b2e71dcc3352f0a4e509affb9528697e