am 67640c0c: Workaround for crashing on rotation. (Bug 6611883)

* commit '67640c0cbe27e6c83b69070d23ea50c4a6f18447':
  Workaround for crashing on rotation. (Bug 6611883)