Merge "Update a comment about when setOrientationHint() should be called" into gingerbread