Merge "DO NOT MERGE Ensure swipe down works for bouncer to dismiss" into udc-dev