Merge "New lock states and animation"