Merge "Restore buildLayer()'s old behavior; it's synchronous again Bug #9193833"