Merge "Remove the <= P restriction for WIFI_P2P" into qt-dev