Revert "Temp not in use"

This reverts commit 6e6b3dd1652a311eb14dd516d8ed8891a29a4124.
Revert "Fix missing nav bar on tablets in landscape mode"

This reverts commit 4e6271ff1f097d03fb78447911f0c9347388d5be.

Conflicts:
	res/xml/system_ui_settings.xml

Change-Id: I5c10126e0fff8d3c36c5dd647cf03c63d2171d08