Merge "Fixed notification scrim top corner radius" into udc-qpr-dev