Merge "Call updateColors() explicitly when theme changes" into tm-qpr-dev