Do Not Default Hide Labels

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