Merge "Update argument of Layout methods."