Fix NPE on tablets.

Commit d547e9d0944b31b2d05378c30f47261571a93262 updated the default
navigation_bar layout, but missed the overlaid one. Fixit.

Change-Id: Ia912075d6dfdb32cd569d6040231dafa894b0c7d
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0