am c15bd51d: Merge "Update default homescreen layout to latest design." into froyo