Merge "Fix layout as there was a regression introduced in a previous CL"