Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev