Merge "Add QS location tile animation"