Merge "Update ArrowPopup to accommodate more rounded dialogs." into sc-dev