Merge "Applied Material design rules to calculate drawer width" into nyc-dev