Revert "Merge branch 'feature/123-password-switcher-dialog' into dev"

This reverts commit 8b4e608170ebc4dcfe42768816c1ea47b6ed3a13, reversing
changes made to 32e30135b5e7b54b659824a7ff384474272ae915.