Merge "Error Linter for Marking Activities and Services and Singleton" into main