Merge "Skip theme application if it's already current" into tm-dev