Merge "DO NOT MERGE Disable NotifShelfRefactor teamfood" into udc-dev