Change state progressions to handle animation/layout separation. Also added debug as needed. Fixes bug 6360835. Fixes bug 6206366. Fixes bug 6286371. Fixes bug 6240494. Change-Id: I1079756a7e3e35ebb9f711f02d005bde9bf65ef0
Change state progressions to handle animation/layout separation. Also added debug as needed. Fixes bug 6360835. Fixes bug 6206366. Fixes bug 6286371. Fixes bug 6240494. Change-Id: I1079756a7e3e35ebb9f711f02d005bde9bf65ef0