Adding Quick Toggle WIP

Change-Id: Iac63f5eba51da3916363c1659043fcdef6efb211