Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2