Merge "Fix bug #8058390 Space is required after the battery sign in the RTL locales" into jb-mr2-dev