Merge pull request #6918 from minggo/fix-object-leak

Fix NSNotificationCenter and NSTimer leaks
[ci skip]
coding style fix
Merge pull request #6921 from minggo/code-fix

coding style fix