Merge "Fix unnecessary relayouts"