Merge "Cleanup listener reference in Screen Attention"