Merge "Camera2: Update for reprocess timestamp" into mnc-dev