Merge "Fix keyboard selectors for tabs. Replace assets by xml files" into jb-mr1-dev