Merge "Refactor arrow popups to allow easier code overriding and sharing." into sc-v2-dev