Toggles: Add Toggles Per Row selection

PS4: Just for upload depending patches

Change-Id: I0fe6b4e5f9824a390fae2155139be26f1f1d2181