Revert change

Revert incorrect animation change. Also fixed device rotation messing up alert view display if an alert is showing.