Merge "Add missing null check to ninePatchInsets" into lmp-dev