Merge "Destroy removal visuals after idler" into devel/master