am ed7d7cba: am c3371eb5: am 49eac16e: am 8ec59a72: Merge "Show hideycling for non-primary users." into klp-dev

* commit 'ed7d7cba9d698aa619b654a485d7c88594ae5090':
  Show hideycling for non-primary users.