Merge "Not keep relative position if display changes."