Correct typo in error overlay guard code
fix for small bug in idle timer
Fix unit tests
Bump patch revision number
Merge remote-tracking branch 'upstream/master'