Merge commit 'fd7ef123c01718e44c13ed638b86a7483ae2d9c9'

Conflicts:
	packages/SystemUI/res/values/dimens.xml