More mobile upcoming events tweaks
Merge branch 'refs/heads/test' into prod