Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2
am: 91f7309d5d
am: 9a3a819ec5
Change-Id: I62d738fda960c6c3fb810b565e81305455224b31
This commit is contained in: