Merging remove-thumb-switcher into Master

Will delete Dev branch after this.