Fix the Charts page activity being ignored.
Merge remote-tracking branch 'nohal/options' into options