Merge "Changed auto on toggle's fixed height to wrap_content and keep it enabled." into main