Merge "Adjust window animations to better match UX spec."