Merge "Fix themes not sticking on reboot if using Xposed framework.