Merge "Fix NotificationTest on small screen." into udc-dev