Merge "Make a fallback tag for listener alarms" into tm-qpr-dev