Merge "Wrapping the inflater into InjectionInflationController." into qt-dev