Fixed hidden "Log out" option in the navbar.

Also fixes annoying intermittent scrollbar.

Change-Id: Ia216498876915343275cdab8bc84fe898e66cfa1
Merge "Fixed hidden "Log out" option in the navbar."