Merge "Rotation support" into gingerbread