Fixed in 3.17-rc1 with commit 20cde694027e, though a fix for regression on multi-head Apple-EFI systems pending.