Merge "Update shelf screenshot UI entrance animation" into main