Merge "Remove unused layout file and specify removed lottie listener" into main