More backports from ZTE Warp 3.4.0