Merge branch 'camera' into 4.14.98