Merge "Fix NullPointerException for WifiDisplayController." into main