Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 90551d0a85 am: cb914954a7 am: 38ae332818

Change-Id: I439e9b293b7187f20cd1623394ad9585897dabe9