Merge pull request #6436 from DieHertz/bfdev-fix-kakute-f7-timer-collision