Merge "Ignore overriding pending animaiton for unlock transition." into tm-dev