Bug 796369 - Software button manager
Merge pull request #10421 from alivedise/bugzilla/796369_master/software-button-manager

Bug 796369 - Software button manager, r=timdream