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

* commit '3e95341fec02b877ee2b97eb03d4a10aa501efb1':
  Workaround for crashing on rotation. (Bug 6611883)