[DF-5048] UIPackage::GetControl improvements
merge