Merge "Merge "Re-enable and fix failing tests in NotificationStackScrollLayoutTest" into udc-dev am: 149fed16 am: 21eacc1d"