Merge "Add a delay to the removal of cached listener alarms" into udc-dev