Merge "Camera: Fix error check for HFR timestamp"