Merge "Use surface position for starting reveal animation" into main