Merge "Fix Resources.getIdentifier usage"