Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev