Merge "Add additional scripts in font mapping" into jb-mr2-dev