Merge "Check whether internal viewport has changed"