Merge "Set elevation of popup and arrow to match. This ensures no shadow overlap." into sc-dev