Merge "Code cleanup and removal of explicit deletion in timer and idler callback...