Merge "Additional notification performance improvements." into rvc-dev