Merge "fix: Include new WIDTH,HEIGHT,ORIENTATION in all." into tm-mainline-prod