6d001c0f7a
Merge commit 'e0aed796f03b080dabae6be0803d4ead1b3260a0' * commit 'e0aed796f03b080dabae6be0803d4ead1b3260a0': Prevent orientation change from triggering activity recreation.