Merge "Clarify notifications behavior in bypass setting." into udc-dev