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

Change-Id: Id2097ac899c051e44ebf465cc90dcdee5da1247f