Merge "Keep Screen saver when unplugging the usb from device" into udc-dev