Merge "Add test to ensure themes get copied from separate resource tables" into lmp-dev