Merge "Fix memory leak due to inner class for handler." into gb-ub-photos-carlsbad