Merge "Add bufferlogs for setExpandedHeight call stack" into tm-qpr-dev