Merge "Check 'DeviceFoldStateProvider' is already started" into udc-qpr-dev