Merge "Fix layout params for TouchProxy"