Merge "camera2: Fix request ID bug"