Merge "Temporary revert "Clean up phone window save/restore""