Merge "Clear leave shade open on bouncer exit" into main