Merge "Update APP_TRANSITION_STATE for Shell transition"