Merge "Fix system toolbar doesn't use correct theme." into tm-qpr-dev