Merge "Fix NightDisplayListener in AutoTileManager" into udc-qpr-dev