Active display (1/2)

Change-Id: Ib0cb3ade01d9524cf75661246b82e2ef0216fdc4

Conflicts:
	packages/SystemUI/res/values/cr_dimens.xml
	packages/SystemUI/res/values/cr_styles.xml