fix up expanded desktop, if navbar got disbaled, and settings were changend before

Change-Id: Icb29df97822ae14fd08b897837fdd69b22c8b105