Merge branch 'camera-v4.7' into camera-v4.8

Pull changes from camera-v4.7 branch. Should reduce differences to mainline.