Merge "WifiDisplayController: Retrieve WifiP2pManager lazily"