Merge "Fix layout issue"