fix #4541: some phones do not support SENSOR_DELAY_NORMAL for rotation
Merge branch 'issue-4541' into release
Merge branch 'release' into upstream