Merge "Fix UI not dismissed after scroll capture"