Merge "Cleanup listener reference in SmartAutoRotate"