Merge "camera2: Don't race while dumping last frame metadata" into klp-dev