Merge "27869: Don't require a LinearLayout orientation when style is set"