Merge "Hide the new bouncer message views by default" into udc-dev