Merge "Ensure click sound effect plays when TabView is clicked" into nyc-mr1-dev