Log out button is now non-focusable..
Merge remote-tracking branch 'origin/dev' into dev