Merge "Prevent hotspot from being affected by the wifi retention feature" into udc-dev