Merge "workqueue: fix possible livelock with concurrent mod_delayed_work()" into msm-4.8