Merge "Make AppRestrictionsHelper leanback-aware"