Whitelist 'useskin' and 'uselang' when choosing buttons to show

Fix related comment and typo.

Change-Id: I3e9d1e2e8cfcc9ed3d21617eccf2fae508251a49
Merge "Whitelist 'useskin' and 'uselang' when choosing buttons to show"