Merge "Settings: Fix NPE FC when access saved wifi p2p device after screen rotation"