Temporary revert "Clean up phone window save/restore"

This reverts commit 0578a725bf6905267b9caed6f5a8cedb2946e71e.

Change-Id: Ic460a0a7785a6829aab9963191714120859d36b0
1 file changed