Merge "Fix SlidingDrawerTest flakiness" into jb-dev