Merge "Some notification history fixes" into rvc-dev am: 69d210c7df

Change-Id: I122252be30db11ea6030d5d23c353d36b617b059