Cherry-picked via 3-way apply of net delta against stage HEAD. All 8 files applied cleanly including the new static/pwa-startup.js. Co-authored-by: AJV20 <abdielvc@me.com>