Merge "DO NOT MERGE.  From main -- Start work on simulating landscape/portrait when orientation is locked." into honeycomb-mr2