Fix hidden navigation bar in expanded desktop mode not being correctly
reflected.

Change-Id: Ie40951c0787d3960a8e6e3b94544632f7633a376
merge changes from CyanogenMod 10.2 into local branch