Merge "Make sure flagging for settings activity works" into main