Merge "Handle split layout tests for phones"