Merge "Update dynamic height adjusting" into sc-dev