Merge commit 'ccec75e7' into eclair-plus-aosp * commit 'ccec75e7': Prevent orientation change from triggering activity recreation.