Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev