Merge "Update DisabledUdpfsController logic" into sc-dev