Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev