Floating toggles (2/2)

Change-Id: Ic112b854c6209eff31ab379325fdf1e8e0caa361
Merge "Floating toggles (2/2)" into jb3