Merge "Force minimize SR when timeline is expanded." into main