Change Redundant Layout Controls GitOrigin-RevId: b50d71b1f75d202334442b3f6cb5037ed0d8a411
Bring Back Redundant Layout Controls GitOrigin-RevId: a725e8742ab41612b285bcab23054ba9da15b60f