Add more variants to the barrier

Change-Id: I3247fc0c6ad5a9cf5d1aa64ea998ddeaaa3963be
overlay: Enable torch quicksettings tile

Change-Id: Ibc2051927dddb45fd2b14f0f79f14d8bdaa9b543
Merge remote-tracking branch 'cm/cm-10.2' into HEAD