Fix spacing issues on devices with/without nav-bar in overview settings panel

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