Merge "Fix multiple styles case in resource resolution." into lmp-dev