Merge "Add HIDE_CLOSE_CURRENT_SESSION" into main