am 442358f1: DO NOT MERGE Fix history crash on 7in

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