Merge "Fix lingering theme color reset on reboot issue" into tm-qpr-dev