Merge "Fix recent regression in hideytoast." into klp-dev