Merge "Apply leanback library change" into nyc-dev