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

Change-Id: I480c7cc7e8123c6f83573842e1e8970c79aba7f8