Merge "diag: Handle data ready notification properly"