Merge "Fix style resolution for styles with '.' [DO NOT MERGE]" into jb-mr2-dev