Previously deep linking into settings panels didn't work consistently.
This commit does some refactoring to fix this.

Changelog: fixed