Merge "Trigger EPS fallback instead of scanning CS" into udc-dev