[SD-1008] Added spike expiry in desk edit pop up
Merge remote-tracking branch 'tolga/devel' into devel