Merge 3.1.0 into stable.
Clear queue expiry timer ref when fired
Merge bug25549
stable to default