Merge "Add logs and set visibility to gone on animation end" into main