Bug 936185 - [Settings] Move shims into desktop helper