Merge "use appropriate fallback chain for style" into jb-mr2-dev