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