Merge "Removing unused spinner_active Bug: 5076695"