Merge "Wrong layout file chosen for 6" phones." into nyc-dev