Merge "Remove callback when idle not added" into devel/master