Merge "Provide custom icon/title for OTA_UPDATE_UID"