Merge "Floor slave lag before display"