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

Change-Id: Ie40951c0787d3960a8e6e3b94544632f7633a376
Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_frameworks_base into cm-10.2