Merge "Make DynamicResource as dagger singleton (15/n)" into main