(Apple) Big merge - merge ios_ui_refactor by hand - note to meancoot -
don't let a branch get out of date for this long - merging it by
hand was not pretty