Merge "Check mIncludeCode before building appComponentFactory"