Merge "Fix an NPE in PhotoSelectionHandler. mListener was always null"