When CustomContent is enabled prevent it from displaying in OverView mode

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