Merge "Add an assertion for thread-satfy check to Timer" into devel/master