QS: smaller tiles: Fix typo

Change-Id: I163be04778d908733b3ad2013c70e6c4bb6185a4
Settings: lock screen grammar fix

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

Conflicts:
	res/values/cm_strings.xml

Change-Id: I802dafae6710486fb10852b9d5ccad1fa84d2dd4