Merge "Properly setting up haptics on IconView when MSDL is enabled." into main