Merge "Align layouts between single and two target preferences."