Fix navigation bar not showing when switching from tablet to phone ui

Change-Id: I57bb0a0a9a365779f62f75d3f8138168771ce3bd