Merge "Render control background without creating extra actor" into devel/master