Merge "Prevent dismiss divider going minimized to recents for other users"