Merge "Fix BP did not dismiss after swiping up the notification bar" into udc-dev