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

Change-Id: I7b7eecab337ba84983d37d4a909f5cc1b89c9dad