Merge "Add assist content control flag" into main