Fix rotation crash in springboard am: a84f1d4ec9
am: 7eacebcb52

Change-Id: Ie1cb70f9b9b42e2df0184e9fc9049b0429baf729