Merge "Fix notification history crash & layout" into rvc-dev am: 9229504fe2 am: 91f7309d5d am: 9a3a819ec5 am: aff183a602

Change-Id: I788ce13ef056a2be544d58c5586e6f87ff595794