[[ Merge-6.7.0-rc-3 ]] Fix unfinished merge for mobile platforms
Merge pull request #1288 from runrevsebastien/merge_6-7-rc-3

[[ Merge-6.7.0-rc-3 ]] Fix unfinished merge for mobile platforms