* changes: [automerger skipped] Merge "DO NOT MERGE Disable NotifShelfRefactor teamfood" into udc-dev am: 20a77c7b am: b5cc3187 -s ours [automerger skipped] DO NOT MERGE Disable NotifShelfRefactor teamfood am: c164c2b6 am: 437630e1 -s ours