Merge "[PB] Do not show snapshot if uiMode has changed." into main