Merge "hasKeycodeLocked() also checks usage codes"