Merge "Add screen layout size as one of the resource filtering axes."