Merge "Ensure callbacks removed when view detached." into sc-qpr1-dev