Merge "Do not crash when passing null into buildTemplateMobileAll"