Merge "Fix pager state after configuration change" into udc-dev