[[ Bug 11080 ]] Android input field fontSize setting value in incorrect units
Merge branch 'bugfix-11080' into release-6.1.1