Merge "Add displayId for WMS override pending transition APIs."