Merge "Don't move clock when warping in PagedView" into klp-dev