Merge "Better handling of unresolved theme attributes" into lmp-dev