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

Change-Id: Ieb20d22d3d983ef2a0471cb04e88742db298a99d