Merge "leanback: switch to use helper methods for margins" into nyc-dev