Merge "Change APM notification from phone to device" into udc-dev