Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
am: 256f070ed0
am: 33beacef89
Change-Id: I20a01ccfe1c7d9cfd8ce0dc1ca44669fb68448d1
This commit is contained in: