Merge "Fixes for dim bounds and touch bounds"