Merge "Only fade window token on exact rotation change" into sc-dev