Merge "Fix bug unregistering stationary listener" into sc-qpr1-dev