Merge "Notification history should always be accessed as uid 1000" into rvc-dev