Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo