Merge "Remove watch_foreground_changes flag" into main