Merge "msm: camera: Delete list entry after work has finished" into msm-4.9