Merge "Update transform hint from relayout window (2/2)" into sc-dev