Merge "Decrease sensitivity of orientation changes a bit." into gingerbread