Merge "camera3: Add flush"