Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev