Merge "Update shade transition on full expand or collapse" into main