Merge "Adjust padding for CFUT layout to display UI properly." into r-keystone-qcom-dev