Update way cookies notice shown
Merge branch 'cookies-notice' into develop