Merge "Revert "Re-enable and fix failing tests in NotificationStackScrollLayoutTest"" into udc-dev