Merge "camera2: Improve code readability for FrameNumberTracker."