Merge "Use single snapshot when predictive back opens two adjacent activities" into main