Merge "diag: Move registration cleanup function to work queue" into msm-3.4