Merge "Permissions check for Wifi Display configuration"