Merge "A workaround for swipe-down-to-dismiss issue" into udc-dev