Merge "Changing the system theme no longer causes a UMO flicker" into tm-dev