Merge "[317580] fix issue where the screen wouldn't be rotated properly in bypass mode" into gingerbread