Popup arrow: Handle options properly.
Merge branch 'master' into popup-widget-review