Merge "Disabled unfocusable scrolling when RV has no focused child" into nyc-support-25.2-dev am: 670f842920
am: ff1a50fc8a

Change-Id: Ic29370f2380bcba45444b253bef2324f4aed4006