Merge "If the surface is lost, release it" into lmp-mr1-dev