Security page: display menu button rather than back button
Merge branch 'master' into test-notifications

* master:
  Security page: display menu button rather than back button