Merge "Disable assertion check for SimpleActivity and fix linter" into main