Merge "Reset support for dark theme." into tm-qpr-dev