Merge "Merge "FixBug: Round corner gone when scroll to non-first item and drag to close" into pi-dev am: d732ec697e" into pi-dev-plus-aosp