Merge "Camera: Reset metadata entry before ZSL query" into sc-dev