Merge "WM: Add a crop to touchable region if needed"