Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
am: 18fce0a7cf

Change-Id: I0492b3bd442c381f2b7b75707719cc3631bda796