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

Change-Id: I67aaada84389e24b153b514c936c0f72f7bcf641