Merge "Fix bug 3248342 - resource not found for non-xlarge"