Merge "Add flows for whether user is interacting with the shade" into main