Merge "TintController: add lock to fix NPE problem." into main