Merge "Show the generic bouncer on remote input" into sc-dev