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

Change-Id: I07e16d38defe17b09d24bb8f19994564773e0540