DO NOT MERGE Fix history crash on 7in

 Bug: 4490754
 This is a cherry pick from master of CL Ia1f397e0

Change-Id: I6c4aa3128648ed4a3ef44b6c9197863721ed0dc6
4 files changed