Task no: 24843, 24842, 24841
Also quick fix on switchbox styling

Change-Id: I082de8afddaf4dffff1cd278d3d4046fcb027edb
behatnotneeded: styling only
(cherry picked from commit 37b839e8)