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

Change-Id: I89237c1166e44fc15c617c4f4dbc991523eda677