[DF-4453] Fix for native controls.