Merge "Fix regression, don't NPE if Switch doesn't have a thumb set" into lmp-mr1-dev