Merge "Swap buttons in call forward settings dialog" into oc-mr1-dev