Merge "Cleanup NOTIF_LS_BACKGROUND_THREAD" into main