Merge "[Thread] make the Manager and Controller class 'final'" into main