Merge "Clean up BoringLayout#isBoring() a little" into nyc-dev