Tested on the following devices to ensure there's no regression for Huawei devices:
Closes #1504 (closed)