Merge "Use dedicated build files for phones and tablets" into main