Merge "sync ctxpopup with upstreamed version"