Merge "Improve shell transition of dismiss by divider"