Merge "Fix LockIcon to use Context.getDrawable(int)"