Bug 929813 - [Settings] Split up hotspot panel +shepherd