Merge "Some notification history fixes" into rvc-dev am: 69d210c7df am: 256f070ed0 am: 33beacef89 am: 539e7e1fb4

Change-Id: Icbfebc3a197419c2cfc41f547d1a9c4e89860faa