Warn users about private mode and disabled cookies. Also merge changes pushed to AMO out of band.