* commit 'c6d6389ffc51429754f4f995e0d510ea33e12b13': Partial revert "Load device default theme mapping from resources"