Merge "Band selection: Add handling for layout changes."