Merge "Ensure we don't pass null values in to Theme.resolveAttributes" into lmp-mr1-dev