Merge "Apply correct bottom padding to layouts" into nyc-dev