Merge "Set PIP corner radius after rotation"