Fix CustomToggle Actions as well.

Didn't notice this, was building against an old sync.

Change-Id: I8076860512341340c0e8b81d9b78c596a025508a
Merge "Fix CustomToggle Actions as well." into jb-mr1
RC: Ribbon use updated getArray / putArray

Change-Id: Ifa39883cc912635fd89e726d9a00bd47a92a3b0a
Signed-off-by: Stevespear426 <stephen.k.spear@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1