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

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