Merge "Move ProviderColumn.kt to debug folder"