Merge "Fix leak in NotificationStackScroller by nulling out translatingParent"