Merge "Fixing no first "device added" notification." into mnc-dev