Merge "Center switch vertically with primary text" into oc-dev am: 4b2cecbb53
am: b07f6932bf

Change-Id: Ibbaa8524ce79b04d5469edd0d2369ac0e103fe46