Merge "Crash early on missing Wifi Display dependencies"