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

Change-Id: I99353e23fd66af73c91c36e69201d6049e2bb746