Merge "fix [3123221] Video sticks playing back upside down following orientation switch" into gingerbread