[DF-4835] Fix UIControl saving