Merge "Reload theme when ui mode changes"