Remove navbar from multitheme commit, this would require a significant rewrite for us

Change-Id: Ia6711215b168f7eafc2589e9a14244622e990254