Merge "Only restore saved surfaces in the last visible rotation." into nyc-mr1-dev