Merge "Permit Aspect Ratios Between 1.333 and 1.86" into honeycomb-mr2