Merge "Add null check to aovid NPE on un-matched close()." into ics-mr1