am 5637b87d: Fix workaround for crashing on rotation. (Bug 6611883)

* commit '5637b87d8b71f2af1794abcd980d9d7ffacb7333':
  Fix workaround for crashing on rotation. (Bug 6611883)