Merge "Remove panel paddings/margins when QS is customizing" into nyc-dev