Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev