Merge "Fix bar visibility after dismissing while stashed" into main