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

Change-Id: I6b5b782edf051eeb4b87e29d711730c34b05d179