Merge "Update when display change callback on legacy transition" into tm-qpr-dev