am eb19c49b: (-s ours) am 442358f1: DO NOT MERGE Fix history crash on 7in

* commit 'eb19c49ba00fb25d982532a54e50cf128ea93e88':
  DO NOT MERGE Fix history crash on 7in