Merge "Don't retain global ref to last inflated context." into gingerbread